From 703d5340f1076994206a83e37f505a4ff8503e2c Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Thu, 8 Mar 2018 23:36:41 +0100
Subject: [PATCH] rotategesture: Port to new API model

---
 demos/gtk-demo/gestures.c | 4 ++--
 gtk/gtkgesturerotate.c    | 6 +-----
 gtk/gtkgesturerotate.h    | 2 +-
 testsuite/gtk/gestures.c  | 3 ++-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/demos/gtk-demo/gestures.c b/demos/gtk-demo/gestures.c
index 67d1e10d66..72248a9cc9 100644
--- a/demos/gtk-demo/gestures.c
+++ b/demos/gtk-demo/gestures.c
@@ -188,12 +188,12 @@ do_gestures (GtkWidget *do_widget)
       g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
 
       /* Rotate */
-      rotate = gesture = gtk_gesture_rotate_new (drawing_area);
+      rotate = gesture = gtk_gesture_rotate_new ();
       g_signal_connect (gesture, "angle-changed",
                         G_CALLBACK (rotation_angle_changed), drawing_area);
       gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
                                                   GTK_PHASE_BUBBLE);
-      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
+      gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (gesture));
 
       /* Zoom */
       zoom = gesture = gtk_gesture_zoom_new (drawing_area);
diff --git a/gtk/gtkgesturerotate.c b/gtk/gtkgesturerotate.c
index 2b28ce4b10..dfa6f597ed 100644
--- a/gtk/gtkgesturerotate.c
+++ b/gtk/gtkgesturerotate.c
@@ -248,7 +248,6 @@ gtk_gesture_rotate_class_init (GtkGestureRotateClass *klass)
 
 /**
  * gtk_gesture_rotate_new:
- * @widget: a #GtkWidget
  *
  * Returns a newly created #GtkGesture that recognizes 2-touch
  * rotation gestures.
@@ -256,12 +255,9 @@ gtk_gesture_rotate_class_init (GtkGestureRotateClass *klass)
  * Returns: a newly created #GtkGestureRotate
  **/
 GtkGesture *
-gtk_gesture_rotate_new (GtkWidget *widget)
+gtk_gesture_rotate_new (void)
 {
-  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-
   return g_object_new (GTK_TYPE_GESTURE_ROTATE,
-                       "widget", widget,
                        NULL);
 }
 
diff --git a/gtk/gtkgesturerotate.h b/gtk/gtkgesturerotate.h
index 07fa0f8583..1c7529bd4a 100644
--- a/gtk/gtkgesturerotate.h
+++ b/gtk/gtkgesturerotate.h
@@ -43,7 +43,7 @@ GDK_AVAILABLE_IN_ALL
 GType        gtk_gesture_rotate_get_type        (void) G_GNUC_CONST;
 
 GDK_AVAILABLE_IN_ALL
-GtkGesture * gtk_gesture_rotate_new             (GtkWidget        *widget);
+GtkGesture * gtk_gesture_rotate_new             (void);
 
 GDK_AVAILABLE_IN_ALL
 gdouble      gtk_gesture_rotate_get_angle_delta (GtkGestureRotate *gesture);
diff --git a/testsuite/gtk/gestures.c b/testsuite/gtk/gestures.c
index dd38ffa136..afe7cd3679 100644
--- a/testsuite/gtk/gestures.c
+++ b/testsuite/gtk/gestures.c
@@ -356,8 +356,9 @@ add_mt_gesture (GtkWidget *w, const gchar *name, GtkPropagationPhase phase, GStr
   data->str = str;
   data->state = state;
 
-  g = gtk_gesture_rotate_new (w);
+  g = gtk_gesture_rotate_new ();
   gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (g), phase);
+  gtk_widget_add_controller (w, GTK_EVENT_CONTROLLER (g));
 
   g_object_set_data (G_OBJECT (g), "name", (gpointer)name);
 
-- 
2.30.2